Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Thu, 29 Jul 2010 23:01:42 +0000 (23:01 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Thu, 29 Jul 2010 23:01:42 +0000 (23:01 +0000)
commit7d9bbe03eccf91bbb30f97ff55b2e6063cdbb235
tree2d952a2e515a91ca85289fa6b98f521f643fd6d1
parente40413f20a1b0c63e6a1aab311579fe713804b91
parentb2965604101355ba472531c64eb79fe6d21a3bbe
Merge from mainline.